# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1058.1.1 -> 1.1058.1.2 # drivers/acpi/system.c 1.13 -> 1.14 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 03/08/05 bjorn.helgaas@hp.com 1.1058.2.1 # Merge hp.com:/home/helgaas/linux/linux-2.4 # into hp.com:/home/helgaas/linux/to-marcelo-2.4 # -------------------------------------------- # 03/08/05 calum.mackay@cdmnet.org 1.1058.3.1 # [PATCH] export the symbol "mmu_cr4_features" for XFree86 # # I'd like to request comments on the appended; proposed patch for 2.4 to # export the symbol "mmu_cr4_features". # # This is needed by the XFree86 DRM kernel drivers, since Christoph's # backport of vmap() in 2.4.22-pre7. [some] DRM kernel drivers (e.g. radeon] # refuse to load without this fix, from 2.4.22-pre7 onwards. # # cheers, # Calum. # # # [diffs -u against 2.4.22-pre9] # -------------------------------------------- # 03/08/05 manfred@colorfullife.com 1.1058.3.2 # [PATCH] fix select() with an xoffed tty # # Hi Marcelo, # # Attached is a backport of a fix that just went into 2.6: # # <<< # Eli Barzilay noticed that select() for tty devices is broken: For # stopped tty devices, select says POLLOUT and write fails with -EAGAIN. # # # http://marc.theaimsgroup.com/?l=linux-kernel&m=105902461110282&w=2 # # I've tracked this back to normal_poll in drivers/char/n_tty.c: # # > if (tty->driver->chars_in_buffer(tty) < WAKEUP_CHARS) # > mask |= POLLOUT | POLLWRNORM; # # It assumes that a following write will succeed if less than 256 bytes # are in the write buffer right now. This assumption is wrong for # con_write_room: if the console is stopped, it returns 0 bytes buffer # size (con_write_room()). Ditto for pty_write_room. # <<< # # Could you include it into your next 22-pre kernel, or does it has to wait for 2.4.23? # # -- # Manfred # # # # [ Part 2: "Attached Text" ] # -------------------------------------------- # 03/08/05 tytso@mit.edu 1.1058.3.3 # [PATCH] Correct 64-bit write system call assignment # # Hi Marcello, # # The following patch (the BK Linux 2.4 tree) is needed to fix some # 32/64-bit issues with the write system call. There are a number of # places in the VFS stack (and in ext2/3 filesystem --- possibly others, # but I haven't had the time to audit them yet) where the number of bytes # written assigned to an integer instead of a ssize_t. This causes the # top 32-bits of the returned value to get lopped off, so that a write() # of 4 gigabytes returns 0 instead of 4GB. # # The patch is fairly straightforward, and obvious(tm). Please apply. # # - Ted # # # This is a BitKeeper generated patch for the following project: # # Project Name: Linux kernel tree # # This patch format is intended for GNU patch command version 2.5 or higher. # # This patch includes the following deltas: # # ChangeSet 1.1052 -> 1.1053 # # mm/filemap.c 1.85 -> 1.86 # # fs/ext3/file.c 1.3 -> 1.4 # # # # The following is the BitKeeper ChangeSet Log # # -------------------------------------------- # # 03/08/03 tytso@think.thunk.org 1.1053 # # Fix 32/64 bit issues. # # -------------------------------------------- # # # -------------------------------------------- # 03/08/05 benh@kernel.crashing.org 1.1058.3.4 # [PATCH] ppc32: Fix PowerMac mediabay driver # # Hi Marcelo ! # # The mediabay driver for PowerMac (hotswap IDE bay) got broken in 2.4.21 # by the switch of ide pmac to mmio, this fixes it along with a longstanding # bug where the timeout waiting for the drive to be ready # was actually infinite. # # Please apply. Note that proper operations for this driver requires # the other patch I just sent that fixes proper keeping of the "hold" # flag in hwif during ide_unregister() call. # # Ben. # -------------------------------------------- # 03/08/05 bunk@fs.tum.de 1.1058.3.5 # [PATCH] Fix circular dependency # # o Fix irq handling of IO-APIC edge IRQs on UP # # This patch adds for no good reason two #include's to # include/asm-i386/hw_irq.h resulting in a circular dependency between # headers. # # The patch below removes these #include's again. # # I've tested the compilation with 2.4.22-pre10. # # cu # Adrian # -------------------------------------------- # 03/08/05 marcelo@logos.cnet 1.1058.3.6 # Changed EXTRAVERSION to -rc1 # -------------------------------------------- # 03/08/05 marcelo@logos.cnet 1.1060 # Merge http://gkernel.bkbits.net/misc-2.4 # into logos.cnet:/home/marcelo/bk/linux-2.4 # -------------------------------------------- # 03/08/05 bjorn.helgaas@hp.com 1.1058.1.2 # ACPI: (acpi_power_off): for non-x86, use 0x20030714 code. (It used to depend on # acpi_suspend(), which is currently x86-only.) # -------------------------------------------- # diff -Nru a/drivers/acpi/system.c b/drivers/acpi/system.c --- a/drivers/acpi/system.c Wed Oct 8 09:05:44 2003 +++ b/drivers/acpi/system.c Wed Oct 8 09:05:44 2003 @@ -92,7 +92,13 @@ static void acpi_power_off (void) { +#ifdef CONFIG_X86 acpi_suspend(ACPI_STATE_S5); +#else + acpi_enter_sleep_state_prep(ACPI_STATE_S5); + ACPI_DISABLE_IRQS(); + acpi_enter_sleep_state(ACPI_STATE_S5); +#endif } #endif /*CONFIG_PM*/